Merge git://git.denx.de/u-boot-dm
authorTom Rini <[email protected]>
Tue, 16 Jan 2018 15:12:40 +0000 (10:12 -0500)
committerTom Rini <[email protected]>
Tue, 16 Jan 2018 15:12:40 +0000 (10:12 -0500)

Trivial merge